Add gdk_window_get_unscaled_size

This is required for the X backend GL integration. If the
window has a height that is not a multiple of the window scale
we can't properly do the y coordinate flipping that GL needs.
Other backends can ignore this and use the default implementation.

https://bugzilla.gnome.org/show_bug.cgi?id=739750

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index be1b0ed834b5454908b97c38df66df308f57d8bf..ca89811e4da9f735b089bddc6beda2f301d4f5ff 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -375,7 +375,9 @@ void       _gdk_window_update_size       (GdkWindow      *window);
 gboolean   _gdk_window_update_viewable   (GdkWindow      *window);
 GdkGLContext * gdk_window_get_paint_gl_context (GdkWindow *window,
                                                 GError   **error);
-
+void gdk_window_get_unscaled_size (GdkWindow *window,
+                                   int *unscaled_width,
+                                   int *unscaled_height);
 
 void       _gdk_window_process_updates_recurse (GdkWindow *window,
                                                 cairo_region_t *expose_region);

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 4ebf461e6ca4d619a23d6d2bd6788bff7e18f5c5..6d56a6c7e4308e02a217402a8fb0cdec42bbe3ce 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -11045,6 +11045,37 @@ gdk_window_get_scale_factor (GdkWindow *window)
   return 1;
 }
 
+/* Returns the *real* unscaled size, which may be a fractional size
+   in window scale coordinates. We need this to properly handle GL
+   coordinates which are y-flipped in the real coordinates. */
+void
+gdk_window_get_unscaled_size (GdkWindow *window,
+                              int *unscaled_width,
+                              int *unscaled_height)
+{
+  GdkWindowImplClass *impl_class;
+  gint scale;
+
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (window->impl_window == window)
+    {
+      impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
+
+      if (impl_class->get_unscaled_size)
+        return impl_class->get_unscaled_size (window, unscaled_width, unscaled_height);
+    }
+
+  scale = gdk_window_get_scale_factor (window);
+
+  if (unscaled_width)
+    *unscaled_width = window->width * scale;
+
+  if (unscaled_height)
+    *unscaled_height = window->height * scale;
+}
+
+
 /**
  * gdk_window_set_opaque_region:
  * @window: a top-level or non-native #GdkWindow

diff --git a/gdk/gdkwindowimpl.h b/gdk/gdkwindowimpl.h
index 2c1bc1e07a1ffc73d851d4c80ddb658f3cb2625d..b8fb0f0286a485e103c9be7ee378fae9924bd9f4 100644 (file)
--- a/gdk/gdkwindowimpl.h
+++ b/gdk/gdkwindowimpl.h
@@ -279,6 +279,9 @@ struct _GdkWindowImplClass
                                            GdkAtom         property);
 
   gint         (* get_scale_factor)       (GdkWindow      *window);
+  void         (* get_unscaled_size)      (GdkWindow      *window,
+                                           int            *unscaled_width,
+                                           int            *unscaled_height);
 
   void         (* set_opaque_region)      (GdkWindow      *window,
                                            cairo_region_t *region);

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 525a798dd1463ddf264e75fe8468757a5825bf43..a7be5de4bb757e1df3f7d7c9c59c99ec762692e1 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -198,6 +198,20 @@ _gdk_x11_window_update_size (GdkWindowImplX11 *impl)
     }
 }
 
+void
+gdk_x11_window_get_unscaled_size (GdkWindow *window,
+                                  int *unscaled_width,
+                                  int *unscaled_height)
+{
+  GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
+
+  if (unscaled_width)
+    *unscaled_width = impl->unscaled_width;
+
+  if (unscaled_height)
+    *unscaled_height = impl->unscaled_height;
+}
+
 static void
 set_sync_counter(Display     *display,
                 XSyncCounter counter,
@@ -5758,4 +5772,5 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
   impl_class->show_window_menu = gdk_x11_window_show_window_menu;
   impl_class->create_gl_context = gdk_x11_window_create_gl_context;
   impl_class->invalidate_for_new_frame = gdk_x11_window_invalidate_for_new_frame;
+  impl_class->get_unscaled_size = gdk_x11_window_get_unscaled_size;
 }